Fix fixup's false filename detection in hunks containing dashed lines #5004
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Description
The existing diff parser incorrectly treated subsequent lines beginning with
---as filename headers while processing hunks. This caused corruption when dashed lines appeared within diffs themselves.Restrict filename detection to only occur between hunks.
This repository https://github.com/abobov/lazygit-fixup-issue demonstrates the issue:
git reset --soft HEAD~<c-f>Find base commit for fixupfatal: no such path ...errorPlease check if the PR fulfills these requirements
go generate ./...)